From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 25 Jul 2011 16:41:39 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~2379^2~10
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=f9b6de1c3892f7477be7711bf88302f6dc70c1a2;p=emacs.git

Merge from trunk.
---

f9b6de1c3892f7477be7711bf88302f6dc70c1a2
diff --cc src/ChangeLog
index e4a76c68ebc,97ddbcc1db9..540f87f9123
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,7 -1,8 +1,12 @@@
 +2011-07-25  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +	* Makefile.in (gl-stamp): move-if-change is now in build-aux.
 +
+ 2011-07-25  Paul Eggert  <eggert@cs.ucla.edu>
+ 
+ 	* bidi.c (bidi_dump_cached_states): Fix printf format mismatch.
+ 	Found by GCC static checking and --with-wide-int on a 32-bit host.
+ 
  2011-07-25  Eli Zaretskii  <eliz@gnu.org>
  
  	* xdisp.c (compute_display_string_pos): Fix logic of caching